Jade refactor