more return conditions, style tweaks