article refactoring ;)