CON-815 | Add docblocks, Occam's razor