refactoring
forgot to commit unit test