Minor cosmetic fixes, just rushed to submit. This marks submitted state