Long way to fix all style errors