Removing extra space at the end of the files
Removing some extra chars
Adding debug property, it's used at some point