Complete Reformat and Fixes
Merge pull request #2 from ironhammer354/master

Complete Reformat and Fixes