Refactoring resolution adjustment.
Cleaning out commented code.