More styling fixes and cleanup