delinted; mostly, along with minor cleanup