Refactoring. Change to unnecessary handles check.
Improved appearance.