clean-up for code style