cleaner way to achieve the last commit