Addtional Commenting and redundant method removal