WIP: codestyle