Some cosmetic changes
Merge branch 'master' of https://github.com/anton-petrov/SPF.git