a little bit of refactor. plus, a cool inspector decorator