CON-605: Code styling