refactor
cleaned up somewhat
Merge branch 'feature/clean-up-core' into develop