refactor: spaces, variables, comments