Fixes to the compilation order, initial style.