Remove unused usings and add extra spaces