Maximise efficiency and simplify