Next attempt to fix code style