Cleanup syntax

Uh, I've done a lot of work. Please, review my fixes.

I will keep cleaning salt, now I'll go deeper into directories. After that, I'll try to clean several files on the top level, since there are many complicated functions and methods.