Modulize, Minor Exception handling