CodeRefactored-TestCodeReview

Test Code Review - commented stuff removed from code