Code Refactor

.