Fixed incorrect assignment of data-array after declaration
Cleaned up indentation