A little bit of a refactoring. All working