Cleaned up my homework 8