repo work
code cleanup