Style tweak and recompile