Cleaned up so I can get stuff done