commented and clean up