Did some cleanup with the help of resharper. I made a branch for this just because I can
Just more cleanup
Merge pull request #1 from LIM-LLC/cleanup

Cleanup