Changed some method and variable names and put some empty lines where needed
Changed method and variable names and put some empty lines where needed