Changed ordering, formatting
formatting fix
formatting fix
formatting fix