style and performance fix