Cleanup/refactor/tweaking and comment pass.
Comment cleanup pass