Some minor cleanups and code smell refactoring