Simplify by removing cleverness and redundancy