organize requires and clean up comments