* Added better commenting and a smidgen of code clean up