move comments out