Reformatted the source and checked that the current system builds.