Made minor code changes