Update dependencies cont.
Formatting
Unnecessary use of fully qualified names due to existing imports