design tidy-up, still needs references