did some refactoring to battleship methids.