Code Refactor, fix broken feature.