Make more helper methods into static functions.