Also renames functions to follow underscore convention
Instead, move the responsibility to the main program. Also, each module had the same, redundant setup.