Make stuff prettier, and create common header