cleaned up some creation code