Reformatting, Slight Changes

Only cosmetic changes to the contributed code and made the third
parameter optional for the reconstruct part.