clean up code
merge commits