Some minor refactoring :)