some cleaning up the design