design / code cleanup