Usings refactoring, Empty lines

Removed unused usings (and sorted)
Some empty lines added, where needed