Made minor refactoring