Made few tweaks

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