Some refactoring code removing duplicated code in activities and suggestions