Put helper functions in helper file, change other things.