Final version - tidying indentation