Update dependencies
Work on slight refactor
Unify indentation to tabs
Remove uneeded uses
Code tweaks