Refactored to match maven's wishes.