Did a bunch of cleaning

I really didn't want to commit every in a separate commit. I'm way too lazy for that. ;)
Signed-off-by: task650 <task650@gmail.com>