made some consistency changes