Cleaning up some mistakes before review