[FIX]Fixed some issue raised after applying new suggested improvements