Optimize game handler

remove duplicate code
remove unneeded checks