More fixes...

Just some minor fixes to make it even shorter and simpler.
=D