Cleaned up hopefully.