format code (reverted from commit 5ed946da166d74660ce8cd6124537edf415e2e6e)