Cleaned

Syntax cleaned, and a bit simplified.