Cleaned a bit
Merge