Started cleaning up/commenting files