Finished refactoring globally
Finished refactoring globally