Fix audit issues, some left
Reduce warnings from audit
Merge pull request #34 from R2-Team2/pretty-code

Pretty code