Refactor for readability. Style updates.