Update to a module

Updated to a module, imposed some style guides.