cleanup last commit a bit