#master: better formatting for CODE