Clarification and syntax cleaning