Tidying up syntax