Refactoring things a bit, not exposing passwords to search results