Made code conventions more consistent.