Revert "Code formatting (curly braces) and extra constructor."

This reverts commit 522adf46deceb5d81a71053d9af8880a329b7e2d.