Made code easier to read
Cleaned up the code