Cleanup + re-wording