Revert "fix after cleanup"

This reverts commit 3ef621c911477e8efba64a024d709b4239369100.
Revert "Minor code clean up + New doxygen comments"

This reverts commit 8d511ccac014787831ec8c8b88f00dd11449ce20.