[Rice] Rough stylistic cleanup. Joins some variable declarations and assignments, misc other formatting to make it not look like ass
Merge pull request #26 from lioncash/master

[Rice] Rough stylistic cleanup.