efficiency and style improvements