Identation and minor things