Alpha v1.0.0.1 - formatting changes and fixing some legacy code