Tidying up code, constant syntax throughout.