Code changed

Formatter was applied. Some names of variables and methods was changed.