#10 Cleanup design