Code style clean-up