Refactored more components