refactor the last commit a bit