Minor tidy up
Wrote User plugin