comment, clean, psql integration