Tiny variable and style changes