Correct a type error
Some cosmetic formatting/structuring cleanup - no functional changes