Add coolness and remove useless comments