backend review and small fixes[~=PEP8]
Merge pull request #34 from anryko/master

backend review and small fixes [~=PEP8]