Made DBPF code more readable