Refactor and formatting cleanup