Refractor to make inline methods class methods