Update code formatting & include paths