Fixes @SideOnly Derp

Big Code Cleanup