* Converted to short array syntax
* Minor cleanups