Cleaned up, Formatted