Cleaned up visibility of pieces in cursor module