cleanup!!! And more comments