cleaning code and comments