code cleanup for configuration files and libpeq