Minor changes to clean up formatting etc