Test, comment, refactoring