Cleaned up Lab 1, 3.4