Clean up password calling into a single line