Fixed a couple off missed column names and removed indenting