Refactor - Satisfy lint's warnings + improve names
Update actions done