Cleaned up constructor. Added coverage.