polished code by review suggestions