Small fixes in code style