[#3477554] Coding standards updated

Deals with the change in coding standards in regards to use-statement ordering, and a type hint that has changed.