Added helper method
Code clean