Refactor through all components' code