Cleaned code a little bit.