Adding -i option
Just organizing and commenting.