Added return statement, removed break logic