codestyle and cat optimization