Fix more formatting issues and tackle the hardcoded string I left in.