Remove date from header. Tidy up code