Cleans up some object creation