Did some more cleaning up