Simplifying
More simplifying and standardising