Component refactoring/clean-up