Refactored exest