Code Review

Yeah, I finally got rid of it on my current branch. I havn't merged it in yet. Thanks for the catch though.