Issue #250, edit code style and documentation