A few more minor tweaks

Changed a couple lines of code. Nothing very spectacular overall.