A bit neater. Handles comments