Design cleanup