some code clean

I just cleaned some things I disliked,
feel free to do what-ever-you-want with these changes ;-)