Refactor code to grunt, minors ajustments.