Revert "minor form arrangement"

This reverts commit 38b86d3c73cc596b0e9c835c84265065050575a5.