Cleaned up look