Added comments/code cleanup