Added return; to void func()'s