style improvements continued