Syntax clean-up and refactoring