fixed bad merge
code cleanup