Nothing really changed here.
Merge stuff
Cleaned code