Touched up various lines of code for minor code quality issues