Fixes for code style