cleaner and more comments