Refactor methods for clarity