Cleanup mostly done on formatting