Cleanded some parts up