some code improvement..