Cleaned up separate constructors