Added player 2 and further refactoring