Continue code refactoring...