Moved 2 code conventions from best-practices document