Getting coding style up-to-date with new feature module

The module have been update to match the newest feature module.