Cleanup formating and reference.