Remove comments and display
Fix minor warning