General Design clean-up