styling tweaks and code clean-up