Comments added and strings sorted
I don't like mess ;)