more code cleanup
fix merge conflict