Add column defaults; clean up code