Cleaning up code a bit, we are working in VS2013