Refactor

Refactored some code and combined black and white squares into one
square class