Revert "solely formatting and quick cleanup"

This reverts commit cc466019b105e365014679bea0240d615db50cb1.
Revert "Added bzToolkit usage for the relative path for the submodule and removed white space"

This reverts commit 5413d0557f7b628aa663293f9a5db7ae611f4134.