Some code style fixes on views