clean up my commented code