tidying up for better readability