v1.0.1 (Code cleanup)