Refactoring according to CC rules
Activity