Cleanup as this file is now small enough to be self explanatory.