reformat code using correct style guidelines
remove old commented out code