Refactored in IDEA