Some Appearance refactoring