Updates to header - file cleanup