refactored to shorten verbage