Beta 1.0.3 - Clean up