Add more useful comments