Refactor style components