Code Cleanup

Cleaned up some code, removed unnecessary array.