Output, documentation and source cleanup