DEV-71 | Fix some errors related to breaking lines and code indentation