Indentation and tab/space issue fixes