Syntactical cleanup