Indentation and minor fixes