further cleanup for standards and documentation