code cleanup. v1.1 Deployed version