Another reformat I forgot to do at right time
One level of braces from major function is gone. Now it's ought to be more readable and whatever
There was an error handling. Now it is working error handling
Merge branch 'master' into init. Bugfixes, other stuff