Revert "code clean up and comments"

This reverts commit 13b0490cd454b40a4a238580c7de8d1ec889d03e.