Add formatting, naming, comments, variables and controlflow