Add comments and remove unnecessary comments