Clean up files. Changed one comment