Refactor calculation and render codes

Created by: giovannifs

Calculation and render are done in the same class. We need refactor it.