Formatted the entire source so future pushes are easier to read