Code commenting and little bit clean-up.