Cleaned a bit the code, removed all the new lines I added previously.