clean up with few comments