Test
Little refactoring