.prop & refactoring