Code cleanup (commenting the why)