Tidying up implicit classes