Appearance things and some refactoring