Some more lint and tidying.