Tidy some parts