Finished All Refactoring Issues