Commented schema properties.
Relocated cleaning line of code.
Fixed merge