* Added suggestions by @yongtang
Signed-off-by: Chanakya-Ekbote <ca10@iitbbs.ac.in>

* Removed trailing whitespaces
Signed-off-by: Chanakya-Ekbote <ca10@iitbbs.ac.in>