Indentation and syntax changes