Make the code cleaner and more readable in pf