Game working now but need to refactor code