Tidying up some code and updatting the formatters.