Refactor android recipe