Added count and fixed some formatting