Refactored to clean up methods