Added more coding conventions