Minor refactoring

Simplifying code:
* added/changed "early exit" logics
* removed old comments