Reformated source
More postgres work