Continue cleaning up design