Header, Visibility, code tidy up.