Fix styles and variable names