refactor commit 2