Refactor: human readability, usage, use && in favor of and (precedence), removed some spaces