design cleanup

bit more stuff