Tidying up pricing