Moar cleanup and documentation and standardization.