refactor equals and move
clean up code
remove code that shouldn't be there
No tabs!