Added clear screen
removed spaces
refactored to remove unnecessary lines
removed comments
refacorted test