mostly maintenance in maintaining internal conventions... a few more tests as well