cleaning up / comments