cleaned up a bit to make it more readable
Squashed commit of the following:

commit 6d38c8a6217bd8d72af5a8f33802341b30388397
Author: Ingolf Wagner <palipalo9@googlemail.com>
Date:   Tue Apr 29 11:07:43 2014 +0200

    just some small changes

commit 6325b9ffc2f1b2aa908ee8d413aeeaab52b1fa17
Author: Ingolf Wagner <palipalo9@googlemail.com>
Date:   Tue Apr 29 11:04:05 2014 +0200

    cleaned up a bit the modifications

commit 5355cfde6d81953e36e6d21ee13ad392aa91c8f3
Author: Ingolf Wagner <palipalo9@googlemail.com>
Date:   Tue Apr 29 11:00:38 2014 +0200

    even better

commit 09da7e897eb41929f1cf9daa1e0538d97952b602
Author: Ingolf Wagner <palipalo9@googlemail.com>
Date:   Tue Apr 29 10:59:40 2014 +0200

    swap is now readable