Much better naming and expressions