Revert "minor fixes on initialization"

This reverts commit 793f8ef7d961c653181cde38819be6a95c3a2ff9.