Tidying up
Small fix
Getting somewhere