Tabs
Cleared up test
Refactored code for better readability