code review changes for MainActivity up to top