Cleaned up; updated