Remove some unnecessary duplicate math, which was making long lines