Flipped some expressions and fixed indentation