removed arrays and fixed formatting