remove unnecessary using statements, correct come comments to use CamelCase