Cleaned up format

Cleaned up old code from format