test cleanliness
code cleanup