Remove copyright headers
Format
Use results of calls to Validations where possible