Completed Assignment and better formatting