Refactored some components and started using oliveOil