style tweaks. removing leftovers.