Cleaned code in activities to use abstract class instead