Cleaning up GA code