Cleanup + improve design.