Refactor and clean up

The incremental rushed nature of.... you know the excuses, time to fix it!