cleaning up comments for flocking