[FIX] simplified some math and conversions
Merge pull request #310 from weese/hotfix/snp-store

[FIX] simplified some math and conversions