Moving to_safe back into class for consistency purposes