Added faker and some formatting