refactor: spaces, comments, imports, variables
refactor: commas, spaces, variable names
Merge branch 'master' into developer