Cleans up style

Just general cleanup for the code, essentially a manual linter.