code changes, spacing fixes