various stylistic changes - ready to push!