Clean up formatting, variable names.
Remove .idea files from project