Fix some coding conventions

Thanks to hiker for the info