Minor updates, coding guidelines changes.