Use shorter expand() function