cleaned up my own terrible headers