Few minor changes on the last commit