Spacing fixes, updated comments, removed !defaults