Refactor: indentation correction, comment dislay change, and use PHP 5.4+ short array syntax