Syntax cleaned