Minor renaming and code style updates