change to better code as suggested by Omkiran