Cleaned up commit logic and function organization

Restrctured function organization to make a bit more sense, and made
some small refactoring tweaks, specifically around the commit logic and
global related functions.

Author: geky