Refactoring

Simple merge