Cleaned up not too bad