Refactoring + game field borders