Did some slight refactoring to make sure that my recent fix didn't cause any bugs
Merge branch 'dev' of https://github.com/magwitch324/wpi-suite into dev