Refactor - Compare true arrays, not strings
Refactor - Fix inconsistent coding style