Code as been cleaned up, just a little bit.