Fixed warning of gem's source
Cleaning code and minor changes