Issue #3096719 by daggerhart, ultimike: Code cleanup - coding standards, beautification, and type hints