Simplify password classes