Simplified code a little bit.

I think it's better when there is less code :)