Cleans code and fixes family scope of Activity