Second part of Ariel's suggestions
DOC: last part of Ariel's suggestions done!