cleanup of code

cleanup of code