Further tidying & caps consistency