Comments

Adding comments and some tidying.