clean up comments, declare