Cleaned up HW5