Finishing activity and comments refactor