Some more clean up. Along with some commenting.