Made groupStatesByMove private