Style and module level changes.