More comments and clean up