Minor clean up/refactoring