More work into the code style.