General clean up / comments