improvements-2

Signed-off-by: Man Parvesh Singh Randhawa <manparveshsinghrandhawa@gmail.com>