Added better inline comments