design cleanups