Coding improvements after coding review