cleaned up some of the wrapping layer messiness