Polishing some design things