just code cleanup