Added comments on conditional code