clean up else statements