commented some stuff, cleaned stuff