Refactor for Human Readability