Little Tweaks
Made the code checker a bit happier
Merge branch 'Sort_Optimizings' into develop