minor cleanup on long condos + while statements