More Changes to styling

Signed-off-by: Pralhad Rajgor <pralhad@vitruviantech.com>