Syntax and cleanup