Finished step 3
Finished step 4
Little cleanup.