did some refactoring of the code, including usings, empty lines etc.