Extra changes from IDEA using code formating