Cleaned up some factory methods