Initial commit
Cosmetic fixes