Modify & clarify comments