Issue #421 fix conventions and documentation