STYLE: Fixed previous issues pointed by Julien