got rid of comment code