style adjustments, code clean-up