Code cleanup

Signed-off-by: Jai Govindani <jai@zodio.com>