Normalised using standard pattern, remove most of the code