CASC-219: Cleaned up formatting issues