minor formatting and code clean-up