Tidying!
Added dict