Reduce print spam, made clearer where prints were coming from, some misc clean-up and refactoring