Minor refactoring
More cleaning up