Quick dev data clearing
Refactor out into files
Standard header ordering