Resharper code tidy + namespace changes