Cleaned up code

Better readability.
It was really ugly before D: