Some small design changes

Some nice suggestions from @heathv