Fix indentation
PEP8 and cleanup
Fix hebergementType value extending when empty (#5214)