Minor code cleanup
Released v1.0.6-pl