Added index manipulation
Whitespace cleanup
Added generated files