Updated to use sunra_utils. Various style changes