Tidy up on password class
Template