Code cleanup - remove `return` keyword