Fix style-issues