Minor update to conform to GVC code conventions and warning levels