Little more cleanup

v2.3.0

Little bit of cleanup

Fix everything up

• General refactor to fix broken and terrible code

First release

Convert to module form

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