Refactor read* source unit constructors
Fix doc comment