Small cleanup...
Small refactoring...
Small cleanup...