Fixed up constants and indenting