Game works, need to clean up