#21 addressed code analysis warnings