Cleaned code to make things easier to read. Nothing really changed