[WIP] Some style cleanup and comments.