Updated code styles without return array()