code again cleanup