eliminated redundant code
removed unused private methods
added Ship test file
Merge branch 'refactoring'
Merge branch 'testing'