Cleaned code up a little bit.