Small Refactoring.
Focus on performance optimization at next stage.