Added better code comments