Converted the sources to use the short array syntax