Revert "Modify constructor initializers #7"

This reverts commit 19f6f509d1176ba62c77a5f7dee11d5153a62e74.