Small code optimizations

Let's see, how often i have to do this :p