Done a little more cleaning