Minor coding changes to the module