giza: edits to clean up style and fix bug in actual rendering