james | removed unnecessary comments