Add password constraint: password must have at least 6 characters
Code refactor: style following