Corrected signature of constructor
Documentation and code cleanup