Adjustments in the standard syntax, and removal of redundant code.