#122 Fix built with clang

[Khem Raj]

While compiling with clang there are few issues seen. Proninent among them is use of nested functions. This patch tries to remove the nested functions and additionally fix the diagnostics coming from clang.