cleanup of code
code cleanup