Make some fixes on the code!
PS : Sorry for long not-updating ;)