further refactoring of method naming. finish(?) with castling