Added more inline comments