Cleanup, minor refactor