A bit of good-ol-commenting and cleaning