Code Cleanup

Simpler array