Some more commenting and tidying