Updated CodeStyle and formatted core code