Fixed some indentation problems and cleaned up the code :3

For some reason GH messed up the indentation... :(