cleaned up style more