Refactoring code
Tiny re-organisation