Refactor:Changed to better writing