Cleanup in code.
Merge branch 'master' of https://github.com/andmos/SNS

/SNS