Add second draft of code conventions