refactored away from jade deprecated syntax