Refactored and switched to prezto