Comments fixed and refactored.