More OO and more UFCS. Also more camelCase.