Reformat code and change some name #37

Closed
Zelenyy wants to merge 3 commits from zelenyy into master
No description provided.