further code optimization...