Tidy up of two pages, added a helper file