Formatting
Removed unused tests
Modified variable naming convention
Raised version