Done some standardising