Add more arrays for testing
Add some comments and clean up