Clean up extra code

Smaller size when compiled
Merge pull request #1 from carloselias/master

Sincro from master repo