basic changes, mostly style