American Safety refactored