Refactoring pt. 2

More boilerplate removed.
20 files changed