Code Refactor. Fix