Added comments where it apply