code clean up / comments