Adding comments where appropriate