v1.0.8-alpha3: Cleaned up code