Simplify code to make it easier to read and write.