Comply with some coding conventions