A little bit of code cleanup and commentary