Refactord Code