remove bloat, improve readability