Indentation and further changes