Code beautification changes

Signed-off-by: Jay Patel <jaypa@cybage.com>