clean up / comments