Small clean up to the last commit