Refactoring
Improving comments
Transform some method to static
fixing small bug
improving vocabulary