Under the hood changes in order to improve readability and make fixing errors easier