Add return within each function