Cleaned up code for readability

Actually the last commit.