moar complexity refactors