Refactored Jake file