cleaning up design