Merge "Code cleanup/refactor."