Trvial cleanup and comments