Code clean
Code clean
Code clean
Code clean
Added utility method