Add comments for each role and simplify some tasks