Code conventions, updated project to remove warnings.