Add whitespace to various methods for readability
Refactor code to make it simpler and more readable