#JC-1026 Names and indentations refactoring