case 2525 - Author fix, as well as some indention.