Another refactoring attack :)