Minor code cleanup

Signed-off-by: Shitiz Garg <mail@dragooon.net>