Initial style cleanup