Code reformattting