#7: Uncommitted refactor changes