Move buffer back to .cpp file.
Fix formatting.