More Refactoring Renaming and Removing

Removing Redundant Code and Objects, Improving Code Efficiency.