[#818] Source code formatting + remove extra `;`