Way standard applied.

- way standard
- fixes tests
- add catalogs