Refactored Comment activity and updated UML