Simplify bound logic, fix comment location