- cleaned up the module a bit