syntax clean-up