Simplify function signatures and file name construction