Refactor WebAPI a little, update & remove some usings thanks to ReSharper