Refactored improvements