Implement Code Analysis suggestions. Comment many methods
and move a few things around.