Clean Code

StyleCop approved :)