Cleaned up some of the shape references