Reworking

I decided to rework an old piece of mine. I just changed minor things, but it was nice to work on something with a definite structure from the beginning and just edit :D.