cleaned up so there are only the pieces that we need