general style improvements