Significant cleanup and additional commenting