styling cleanup
merge commit