ENH: Fixed code review comments of Julien Finet