Get it compiling and clean up