some cleanup
harmonization btw. presentation, documentation and code