Cleanup, refactoring user settings, add static method to sync user settings