cleanup part 1, class rename OnIteamClickListener
cleanup part 2, class rename Activity...