Add useful comments, remove stuff that is not needed