Use closures, better angular layout