large cleanup (var names+docs)