(refactor) Not broken, but ugly