Renamed some variables in MainActivity