Syntax & cleanup