Refactoring&CleanUp