fixing code issues
fixing code issues