Missing -and-, general cleanup