Cleaned up Rook class a bit