Cleaned up real good