Further clean up and adding header