made changes according to the review, mostly removing unused code and fixing code to follow the  coding conventions