reduce code size
Revert "keep consistent style"

This reverts commit 5bf53ece72c128ca812ef97ca5e29843f966225e.
Revert "reduce code size"

This reverts commit 0d47b50bf50eb8e2917211a83d0906d32345c6fb.