Various improvements, refactorings and simplifications from PR review