Centralization & After Cleaned up