Refactored, comments added