Refactored components variables.