Little bit of cleanup

Fix up my terrible code

Convert to module form

If program is being run manually, do the same process.  If the program is being run programmatically, define function.