More formatting for syntax, naming