Cleaned up code a bit

Improved readability :)