code cleanup
another round of cleanup