simplifications, spacing adjustments, done right