Fix style conventions