code style cleanup
wip commit