All the efforts to keep the code clean :)

Signed-off-by: Venkateswara Venkatraman
<venkateswara.venkatraman@cbeyond.net>