style fixes to code, almost there