Refactoring, switched to puma