Merge "Refactor to follow kotlin style" into main