Miscellaneous code cleanup
Change 'gi' to 'i'