Technical refacto in order to use monads capability instead of doing a manual filter. Rename some variables too.