And moar "small" refactor - hah.