Cleanup work on design