Code revisit, added dev plan in comments