Added comments regarding improvement and refactoring.