Removed some whitelines
Fixed some readability thingies
Small changes
Merge conflict done