Tidying up code - no functional changes