tested, refactored solution? method