Another refactor, simplify things