reduction in code
some correction