Improve helper method