Cleaned up Constructors