passing in index instead of substring
Clean up code
Clean up code