got rid of some comments
got rid of some useless variables